Merge tag '2.1' into develop

Version 2.1
Require contao/core >=2.11.11,<4-dev now.
Merge branch 'release/2.1.1'