starting the 1.2 branch which will become master after cmf 1.1 is released
Merge branch 'master' into 1.2