(I'm going to change the format of these commits to be more useful in the presence of more than one level of upstream.)