I split the work into clean-up-root and clean-up-roor-pr to separate the more time consuming stuff from the easy parts. The -pr branch is what you merged, isn't needed anymore and has been deleted (by you, appropriately).
I haven't updated the tracking status for issue
#1077 yet. Something I should fix right now.
-matt