Merge proposals dependent on lp:~marcus-lundgren/maya/fix-1020798

lp:~marcus-lundgren/maya/fix-1020798 has no merge proposals.