Merge branch 'release/2.1' into develop
Added LICENSE file.
2.2
Merge branch 'release/2.2'