Merge pull request #2948 from davecivicrm/CRM-13764