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

This reverts commit 52988342dd4e1842fb869be07f95d12483a7fb23.