Merge branch develop into feature/image-services
Conflicts: tests/TestCase.php
Merge branch develop into feature/image-services
Conflicts: src/Resources/contao/dca/tl_settings.php src/Resources/contao/library/Contao/Picture.php
Merge branch develop into feature/image-services
Conflicts: composer.json src/ContaoCoreBundle.php src/Resources/config/services.yml tests/bootstrap.php
Merge branch develop into feature/image-services
Conflicts: composer.json tests/Contao/ImageTest.php