Merge proposals dependent on lp:efx

lp:efx has no merge proposals.