Set the license to its short-name.
Merge branch 'master' into enterprise