BSD + PATENTS
Merge pull request #2312 from zpao/license-update

Update Licenses