Merged r1034213 to the 1.5 branch so that we can start the 1.5.3 release process.
3 files changed