Merge branch 'hotfix-1.1.1' into develop
Merge branch 'hotfix-1.1.2' into develop
Fix composer.json and doctrine fixtures
Merge branch 'develop'