CRM-14807 - replacing stale PR 3450

----------------------------------------
* CRM-14807:
  https://issues.civicrm.org/jira/browse/CRM-14807
Merge pull request #3593 from davecivicrm/CRM-14807

CRM-14807 - replacing stale PR 3450