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

This reverts commit f3ae323b202211677a20064e858d3259a42d001b, reversing
changes made to 52d65ae4620689027837ae3f46268bffdf60eaa1.
Revert "Revert "Merge branch 'master' into gh-pages""

This reverts commit 791b405e17dc11c85a70bc168524f692e62da699.
Revert "Revert "Revert "Merge branch 'master' into gh-pages"""

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

This reverts commit 6b963279d16a45fdda17d5e19560bf94b7fd2d28.
Updated to match Master