Merge proposals

xtradeb packaging has no merge proposals.