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

This reverts commit a559d8abf7e915a8d37325458521262201eccccd.