Merge pull request #6891 from davecivicrm/CRM-17340