Update license info
Update for license file
[Module Tag script: blacklist 2.11.0.4]
Part fix for #6923 language not being set.
Merge branch 'develop' into release/2.11
Version bump
Merge branch 'master' into release/2.11