Copied changes made on gh-pages branch.