one more reordering of license choices
Merge branch 'licenses'