LICENSE and style conventions.
Merge branch 'develop'