merge gh-pages / master