Merged into trunk with commit [788d248407].