License headers everywhere
Merge origin/master