Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 4ad758565ac9cc7f543954ab957e4840385ee1ee.