Merge branch 'release/Magic-v1' into develop
bleh
Merge pull request #1 from Shane-IL/develop

Develop