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