Merged r1332067 to the 1.4 branch.
1 file changed