Merge 1.2.x changes to master