CRM-15489 7.x

See https://issues.civicrm.org/jira/browse/CRM-15489