Merge branch 'master' into develop
Assetic dump is not relevant to composer
Merge branch 'develop'