Updated to latest from gh-pages branch.