Merge pull request #5265 from davecivicrm/CRM-16018