Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."