set the 1.2 API to actually be used as the default
Merge branch 'master' into 2.2