Merging required changes to gh-pages