merge master changes to gh-pages