Merged to trunk on [e161670939].