Merge remote-tracking branch 'origin/master' (reverted from commit 51ccb1d4df3b7607af96161f5d5a2dac85e7e670)