license
Merge branch 'release/license'
Merge branch 'master' into gh-pages