Merging in gh-pages updates