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

This reverts commit 10b09db378aac7a28741bda735d36a8da46cec99, reversing
changes made to bb3f60378d1fca95d5d953ed2f3fc76a1fc59cf8.
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'