Merge branch 'gh-pages'
Revert "Merge branch 'gh-pages'"

This reverts commit c369459927fb22dddaa3432ff1b5de2f38b1ce26, reversing
changes made to e12d09d5409217e8ce6befc1efda3ba8ea1b1fee.
Merge branch 'master' into gh-pages