Merge proposals dependent on lp:~richard-wilbur/bzr/1540333-makefiles

lp:~richard-wilbur/bzr/1540333-makefiles has no merge proposals.