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

This reverts commit 39c2f8f2440570aa759ba41ea768d8967e369de0, reversing
changes made to 63be2b758f2619336d18e46c510bc6b690ba6882.