merge hotfix-1.4.1
Update composer
Merge branch 'hotfix-1.4.2' into develop