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

This reverts commit bb7857bd001875495d60a56644c7767299b8fece.