Incorporate changes from gh-pages branch.