CRM-15485

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