Merge 1.3.0 changes back to master.