Merge proposals dependent on lp:~julien-spautz/cable/clean-up

lp:~julien-spautz/cable/clean-up has no merge proposals.