added id3v2, from f19
Merge branch 'upstreams'