Merge branch 'bugfix/merge-headers-fix' of https://github.com/qzminsk…
…i/contao-core-bundle into hotfix/4.2.1
Merge branch 'split/core' of https://github.com/contao/core into hotf…
…ix/4.2.1 # Conflicts: # src/Resources/contao/config/config.php # src/Resources/contao/controllers/FrontendIndex.php # src/Resources/contao/drivers/DC_Table.php # src/Resources/contao/modules/ModuleArticle.php