Rebase from gh-pages branch
Bump patch version, again
Merge branch 'master' into gh-pages