merging master updates to gh-pages