Merge branch 'master' into dev
- license update