Merge from gh-pages.