Add copyright and licensing info.
Add copyright and licensing info.
Merge origin/master