I see this has now been fixed here:
https://github.com/civicrm/civicrm-core/pull/3121