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