Updating external licenses to reflect latest changes
Merge remote-tracking branch 'upstream/master' into updated-licenses
Merge remote-tracking branch 'upstream/master' into updated-licenses
Merge pull request #149 from oxtopus/updated-licenses

Updating external licenses to reflect latest changes