Bump version to 1.2
Merge remote branch 'origin/master'