Merge "Fix id3 parser crash"