Merge pull request #4350 from eileenmcnaughton/CRM-15446