Merged in changes from 1.5.2p2 release as appropriate.
1 file changed