Merge pull request #5248 from davecivicrm/CRM-15578a