fix some more MBR misidentifications (Joerg Jenderek)
Merge remote-tracking branch 'upstream/master'
merge with upstream