bug#79968: Request for merging "ungraft" branch

[Andreas Enge]

The title says it all. The branch is based on master with ungrafting
commits.

Andreas