Merge pull request #4685 from davecivicrm/CRM-4193