Merge proposals dependent on lp:~spud/spud/fix-non-debian-build-201403

lp:~spud/spud/fix-non-debian-build-201403 has no merge proposals.