Merge pull request #4900 from mrpaulc/CRM-15806