Merge pull request #2752 from davecivicrm/CRM-13578