Merged r1328884 to the 1.4 branch.

1 file changed