Bump version numbers
Merge branch 'release/1.1.2'
Merge branch 'master' into gh-pages