Merge branch 'master' into develop
Relaxing Symfony version constraint
Merge branch 'develop'