Try 2

**Question**:  What in the world is this PR?
**Answer**:  Hopefully something that will teach Git to behave.

**Question**:  What happened to create this monstrosity?
**Answer**:  A force push happened (way back in 1.9.2).

**Question**:  Why is this necessary?
**Answer**:  It'll re-align the stars (actually, though, it'll hopefully get the branches re-synced with each other instead of believing that they diverged at 1.9.2).

**Question**:  Why isn't this merged yet?
**Answer**:  Because Git is scary and I'm afraid that more things will break.