do-not-merge-wip-for-github

No plain-English explanation yet — one is being written right now. Check back in a minute.