merge docs changes from gh-pages