Merge pull request #4715 from davecivicrm/CRM-14696