Merge proposals dependent on lp:~chris-rogers/maus/emr_mc_digitization

lp:~chris-rogers/maus/emr_mc_digitization has no merge proposals.