Update for license file
Merge branch 'release/2.11' into develop