Merge with Sverre's recent module architecture commit.