Merge r1536050 from the trunk.