Merge "Better detection for old MS Office files"