Fix for MAGN-312
Merge branch 'master' of https://github.com/ikeough/Dynamo