Merge branch 'licensing-nogpl'