Merge pull request #4274 from mrpaulc/CRM-14868