FAI

Merge proposals dependent on lp:fai/trunk-old

lp:fai/trunk-old has no merge proposals.