Nukes legacy changes upon rebase
Merge pull request #338 from Simperium/issues/337-nukes-legacy-changes-on-rebase

Nukes legacy changes upon rebase