Add license to Windows distribution
Merge remote-tracking branch 'origin/master'