Merge branch 'master' into license-updates