Merge proposals dependent on lp:~brian-murray/arsenal/updated-mapping

lp:~brian-murray/arsenal/updated-mapping has no merge proposals.