Bump to version 1.2.2
Merge branch 'master' into develop