Code review comment for lp://staging/~marcus-lundgren/maya/fix-1021860

This looks good to me. I'm currently not able to test / merge it since I'm not at home until the end of august. I hope someone does it before then. Thanks for the fixes :)