License got lost at some point
Merge branch 'develop'