Merge branch 'module_paths'