Added missing license
Merge branch 'master' into HEAD