Rebase from gh-pages branch
Bump patch version, again