Merged changes from the 1.5.2p2 release.
(Very rough.)
59 files changed