merge in changes from wp:gh-pages