Add licensing information.
Merge branch 'origin/master'