Merge upstream master into master

Here's the new proposed master.