Merge proposals dependent on lp:~zyga/cdts/fix-packaging

lp:~zyga/cdts/fix-packaging has no merge proposals.