Merge pull request #3979 from eileenmcnaughton/CRM-15196