Revert "Merge remote-tracking branch 'origin/master' into gh-pages"

This reverts commit 6646ea60379871af43dc123a6565b2576049159f, reversing
changes made to d46584d98b1547bae71d8cfd4c7ac2a50ec760e1.