Merge branch 'master' into dependency-types