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

This reverts commit 33237cf57fc4f9bdb6154a934984f17d4c512598.