Checklist: * [ ] The change is trivial (if not, I filed an issue first) * [ ] The change is split into atomic commits * [ ] Commits have messages adhering to [these conventions][git-commit-messages] * [ ] The change is documented (if needed) * [ ] The change is tested (if needed) * [ ] The change passes the specs (`make spec`) * [ ] The change passes ESLint checks (`make lint`) [git-commit-messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html