Update licensing information
Merge branch 'master' into display-refactor