merging a gh-pages change into the master branch.