CRM-15447

Fix for https://issues.civicrm.org/jira/browse/CRM-15447