Bare naked merge and rebase
Merge pull request #1983 from ethomson/revert

Bare naked merge and rebase