Crm 13666

As discussed here - https://issues.civicrm.org/jira/browse/CRM-13666