Merged with commit 3c825f1a.