MIT License
Merge branch 'master' into additions