Port the changes from contao/core@cd66d61d3d1aa25294808fbede392d4fecc93cc2
Merge branch 'develop' of github.com:contao/contao into feature/symfony2