Merged from gh-pages.