Merge "Fix mime detection of easily-confused-with text/plain formats"