Merge remote-tracking branch 'upstream/master' (reverted from commit 2f39efc94e696778858a5f28d0766e9c58261a22)