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

This reverts commit 57b91ab7c309d81083164c6d414f96c8f64eb603.