Merge in changes from the 1.5.2p2 release.

Hopefully I got all this right!
1 file changed