fixed a bug with transitive import in gen modules
Merge remote-tracking branch 'origin/master'