added Apache 2.0 license
Merge branch 'v2.3'