Duplicating changes from gh-pages to master.