Merge branch 'hot-fix' into develop

Conflicts:
src/module/Application/Module.php