Version bump
Merge remote-tracking branch 'origin/gh-page-dev' into gh-pages