Merge pull request #4298 from davecivicrm/CRM-15374