Moved to 1.2-SNAPSHOT
Merge branch 'master' into 2.9