Merge pull request #7485 from davecivicrm/CRM-15967