Merge changes to gh-pages branch.