Merge pull request #6614 from davecivicrm/CRM-16708