Merge branch 'master' into develop
Module update fixModule update fix
Merge branch 'release/1.1'