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

This reverts commit dd19c9eeb15f0b7f06c308378af25fee4b32ff76.