Merge branch '4.6'

# Conflicts:
#	.travis.yml
#	core-bundle/phpunit.xml.dist
#	core-bundle/src/Resources/contao/library/Contao/StringUtil.php
#	core-bundle/tests/Command/AutomatorCommandTest.php
#	core-bundle/tests/Config/ResourceFinderTest.php
#	core-bundle/tests/Contao/ControllerTest.php
#	core-bundle/tests/Contao/GdImageTest.php
#	core-bundle/tests/Contao/SystemTest.php
#	core-bundle/tests/Contao/TemplateTest.php
#	core-bundle/tests/Controller/FrontendControllerTest.php
#	core-bundle/tests/EventListener/AddToSearchIndexListenerTest.php
#	core-bundle/tests/EventListener/CommandSchedulerListenerTest.php
#	core-bundle/tests/EventListener/PrettyErrorScreenListenerTest.php
#	core-bundle/tests/EventListener/ToggleViewListenerTest.php
#	core-bundle/tests/Fixtures/Controller/PageError401Controller.php
#	core-bundle/tests/Fixtures/Controller/PageError403Controller.php
#	core-bundle/tests/Fixtures/Controller/PageError404Controller.php
#	core-bundle/tests/Fixtures/Exception/PageError401Exception.php
#	core-bundle/tests/Fixtures/Exception/PageErrorResponseException.php
#	core-bundle/tests/Fixtures/library/PageError401.php
#	core-bundle/tests/Fixtures/library/PageError401Exception.php
#	core-bundle/tests/Fixtures/library/PageError403.php
#	core-bundle/tests/Fixtures/library/PageError404.php
#	core-bundle/tests/Fixtures/library/PageErrorResponseException.php
#	core-bundle/tests/Fixtures/src/Controller/PageError401Controller.php
#	core-bundle/tests/Fixtures/src/Controller/PageError403Controller.php
#	core-bundle/tests/Fixtures/src/Controller/PageError404Controller.php
#	core-bundle/tests/Fixtures/src/Exception/PageError401Exception.php
#	core-bundle/tests/Fixtures/src/Exception/PageErrorResponseException.php
#	core-bundle/tests/Image/ImageFactoryTest.php
#	core-bundle/tests/Image/ImageSizesTest.php
#	core-bundle/tests/Security/Authentication/FrontendPreviewAuthenticatorTest.php
#	core-bundle/tests/Security/TwoFactor/AuthenticatorTest.php

phpunit.xml.dist

@@ -8,6 +8,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
     </php>
 
     <testsuites>