Update to 1.2.0
Merge remote-tracking branch 'upstream/master'