3 clause BSD license
Merge branch 'master' into tree