Bring in work done on another machine.

This is not the usual "merge work from multiple machines" because the
older commits here are being subsumed, not merged.  The only reason I
don't just force-push the new stuff is that I want the new master to be
a descendent of the previously-publicized master.