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

This reverts commit e11b09aa2cbbd348633b8f89eda9869177cabfd5.