Fixed #4869 (segmentation fault in Tokenizer::simplifyStructDecl (invalid code))
Merge remote-tracking branch 'upstream/master'