Some adjustments to license files.
Merge branch 'master' into jen