CRM-14739

Fix For https://issues.civicrm.org/jira/browse/CRM-14739 against 4.5 (master)