Fix module path in downstream projects
Merge branch 'master' into superproject