v1.2.0
Merge remote branch 'upstream/master'