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

This reverts commit 43fa746db87295b0adc4752c8e826be5fb8601af, reversing
changes made to 39f346470ae24da574774fd6b73915796be9e780.
Revert "Revert "Merge branch 'master' into gh-pages""

This reverts commit 9b851cc57466f9e8f90c7087ba07703add7629c7.
Revert "Revert "Revert "Merge branch 'master' into gh-pages"""

This reverts commit 5bd710c8377413f032687898b328609b23ef9932.