Merge 1.5.2 changes back to master.