Merge branch 'master' into transitive-dependencies