Merge pull request #7480 from davecivicrm/CRM-17716