Merge r1735371 to the 1.6 branch.
1 file changed