CRM-15180 - https://issues.civicrm.org/jira/browse/CRM-15180
Merge pull request #4752 from davecivicrm/CRM-15180

CRM-15180 - https://issues.civicrm.org/jira/browse/CRM-15180