Merge in changes from gh-pages branch