version 1.2 release
bumping versions to stay semver compatible
Merge branch 'master' into gh-pages