Merge pull request #2820 from kumpera/license-change-rebased