Merge "Add support for the TPOS/TPA (disc number) id3 tag."