Merge in gh-pages for branch reset

Was already done in 70a707e631bdffb102a29915f67084bca968e870 but I'm filing a pull request anyway for logging purposes.