Merge 1.2.0 release with master