Added LICENSE - BSD 2-clause license.
Merge remote-tracking branch 'upstream/master'