Sorted out the license.
Merge branch 'master' into loop11