Merge updates from gh-pages branch.