Merge r1815139 to the 1.7 branch.
1 file changed