Merge proposals dependent on lp:~salgado/offspring/remove-dead-code

lp:~salgado/offspring/remove-dead-code has no merge proposals.