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

This reverts commit 489c8434f1178e762f5285a5d928a73f5ec83733, reversing
changes made to 542a12c6804a635d049364ce41c180ba2c40a359.