Summary of changes: 92b5ac2... fix license handling (*) b378efa... Merge branch 'master' into f21 (*) (*) This commit already existed in another branch; no separate mail sent