Merge branch 'master' into dev
bump version
bump version
bump version
Merge branch 'master' into dev
Merge branch 'dev'
Merge branch 'master' into gh-pages