Added license information for vendor packages
Merge remote branch 'upstream/master'