Finish 1.2.0
Merge branch 'origin/master'