Merge branch 'develop'
Use  --prefer-source for composer
Merge branch 'master' into develop