Merge branch 'hotfix/2.2.15'
Fix for modular-scale usage.
Merge branch 'hotfix/2.2.16' into develop
Merge branch 'develop' of https://github.com/GumbyFramework/Gumby into develop