Merge pull request #3661 from davecivicrm/CRM-14789