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

This reverts commit 98241329c1d5d46fa0b6c1fbd01d16ca43a0376a, reversing
changes made to ef981b3bf862528e283c8ba7dbbfcfe5c5ee5fcc.
Revert "Revert "Merge branch 'master' into gh-pages""

This reverts commit 546fcf2909bd420ab1464fe8622929bcb74db084.