Merge pull request #3092 from davecivicrm/CRM-14488