Merged r1163389 to the 1.6 branch to prepare for release.
2 files changed