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

This reverts commit 32b888af1c8ff4bef96477eb7e66ff755fbc7f6f.