Merge r1722000 to the 1.6 branch.
2 files changed