Merge proposals dependent on lp:~evfool/marlin/fixbuildproblems

lp:~evfool/marlin/fixbuildproblems has no merge proposals.