CRM-12471

see http://issues.civicrm.org/jira/browse/CRM-12471 for details