Merge branch 'master' into source
Revert "Merge branch 'master' into source"

This reverts commit 7c016ff2a253ed351a0788d8b4b462e5e4775b94, reversing
changes made to efdb14c64a64d36d2521a4a677b13db2278309b2.
Merge branch 'source'