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

This reverts commit 8422da0efd03650e997003f6a05c29bc89d8c790, reversing
changes made to d8c28ce7159cf60bf83a788cea6d9da21429f9d4.
Revert "Revert "Merge branch 'master' into gh-pages""

This reverts commit 68555920473538f779e45263eb5aca30696f2233.