Merge branch 'hotfix/0.2.1'
Fix ModuleLoader test: git does not store empty folders.
Merge branch 'hotfix/0.2.2' into develop