Get the silly license stuff out of the way
Merge branch 'qlx-1.1'