Merged r1359499 to 1.5 branch.
1 file changed