Merge pull request #6643 from davecivicrm/CRM-17031