Merge branch 'master' into develop
composer.json syntax error fix
Merge branch 'develop'