v1.2 released
Merge remote-tracking branch 'origin/master' into team1