Merge "Parse disc and track numbers per API definition."