Contact reports display Contact Sub Types by name rather than label

When using the basic contact summary report, if you include the 'Contact Sub Type' field the report will display the value stored as it is in the contact table, when it should reference the 'label' field from the contact sub type table first.

It's only apparent when a sub type has been created then re-labelled, or if a core type has been re-labelled.

When viewing a contact the sub type looks ok on the Summary tab, and my understanding of that script is that it passes the sub type from the contact table through 'CRM_Contact_BAO_ContactType::contactTypePairs' first. I think this needs to happen in the Contact templates for display.

This has been replicated in the latest demo sites for 4.6. and 4.7 (Drupal)