Merge pull request #2867 from davecivicrm/CRM-14450