Merge "Better handling of empty ID3 tags"