Merge pull request #7222 from davecivicrm/CRM-17580