Merge branch 'master' into develop
Fixing module loading order bug?
Merge branch 'develop'