Merge branch 'modular' into multiple-inheritance