Merge pull request #5767 from blckmn/licence_update