Revert "Revert "Merge remote-tracking branch 'upstream/gh-pages' into gh-pages""

This reverts commit 0fe0632929554cc1142f72b70c1ba7974f58bd79.