Yeah, this is bad.  Oops.
Merge remote-tracking branch 'refs/remotes/origin/master' into rework