* Merged with default branch at rev 16f3633aaa5a.