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

This reverts commit 2f199457cc742c537a04907f77d8274b3fdbef80.
Revert 2f19945..ad9db5a

This rolls back to commit 2f199457cc742c537a04907f77d8274b3fdbef80.
Revert b8c4aac..97cc9ee

This rolls back to commit b8c4aac292428a19a9a696874e68d2120aceb8a7.