Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Conflicts: assets/contao/js/core.js system/config/ace.php system/docs/CHANGELOG.md system/themes/default/main.css
Merge branch 'master' of https://github.com/backbone87/contao-core in…
…to hotfix/3.2.15
Fix bug in Theme.php - invoking loadDataContainer() after locking can…
… break Theme import.
Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Conflicts: assets/contao/css/layout.css assets/contao/js/core-uncompressed.js assets/contao/js/core.js assets/mootools/core/1.5.1/mootools-request-uncompressed.js system/config/constants.php system/modules/core/drivers/DC_Table.php system/modules/core/library/Contao/ModuleLoader.php system/modules/core/vendor/phpdiff/Diff/Renderer/Html/Contao.php system/themes/default/basic.css
Merge branch 'hotfix/3.2.15' into hotfix/3.3.6
Conflicts: system/modules/core/library/Contao/Controller.php system/modules/core/modules/Module.php system/modules/core/modules/ModuleCustomnav.php system/modules/core/modules/ModuleQuicklink.php system/modules/core/modules/ModuleQuicknav.php system/modules/core/pages/PageRegular.php