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

This reverts commit 8f1477f999be096a84a8c94e21b4e006a3c1a68a.