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

This reverts commit 916d611eca2c128f4956442a6b60d6eb99fc2bbd.