Add name/date to license file
Merge remote-tracking branch 'upstream/master'