- Changed Module::addType() prototype
Merge remote-tracking branch 'upstream/master'