Merge pull request #7386 from davecivicrm/CRM-17147