Merge upstream changes since July

...at least, I *think* that's what I'm asking GitHub to do. I am slightly confused by the UI...