Merged changes from the 1.5.2p2 release.
14 files changed