Merge pull request #7179 from davecivicrm/CRM-14732