merge master with changes from gh-pages