Merges fixes made on gh-pages.