Merge pull request #5092 from davecivicrm/CRM-15750_backport