Update for license file
[Module Tag script: findmefollow 2.11.0.6]
Merge branch 'master' into release/2.11
Merge branch 'release/2.11' into develop