Add option to allow parsing of files containing unknown types
Add option to allow parsing of files containing unknown types
Merge remote-tracking branch 'upstream/master'