Merge 1.2.0 changes back to master.