Licence headers to classes that will stay
Merge branch 'master' into v0.3.x