more license fixes that keep getting away from me...
Merge remote-tracking branch 'origin/master'