Fix failure in new ModuleBuilderTests.testBug522670
- merge failure (incomplete)
2 files changed