for Contao 2.11
Merge origin/master