Merge 1.5.3 changes back to master.