Merge in changes from the 1.5.2p2 release.
1 file changed