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

This reverts commit f51f0a5006d76abd12085b52b8f7c1784bf6e1e1.