Merge pull request #3216 from hansva/master

[RELEASE] License file update