Merge pull request #5179 from eileenmcnaughton/CRM-15798-master