Merge "Added support for ID3v2 meta data in 3gp files"