I have looked at the merge from the Debian and the remaining Ubuntu change can be dropped, so I filed a sync request (bug 125331).
I have looked at the merge from the Debian and the remaining Ubuntu change can be dropped, so I filed a sync request (bug 125331).