- Allow module to import types
Merge remote-tracking branch 'upstream/master'