Update licensing information
Merge branch 'master' into performance-fixes