Merge 1.5.0 changes back to master.