Merge pull request #6024 from davecivicrm/CRM-15775