update master to match gh-page