Master address belongs to export and token are outputting the master address id rather than the contact id or sort_name

Tested on 4.1 alpha (svn) and both Export Contacts and the Master Address Belongs To token from "Send an Email" are outputting the civicrm_address.id of the master address. Pretty sure the "intent" is to output the sort_name of the contact who "owns" the master address linked to the address of the contact being exported (or perhaps the contact ID of that contact).

http://forum.civicrm.org/index.php/topic,22392.0/topicseen.html