Merge "Support for ID3 version 1 (and 1.1) tags in .mp3 files."