fixed handling of typedefs for structs and unions
Merge remote-tracking branch 'origin/master'