more fun with typ defs and name mangling
Merge remote-tracking branch 'origin/master'