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

This reverts commit c9638ccd905276f683b77abd8dce4c825edc85ff.