Merge pull request #3443 from davecivicrm/CRM-14767