Merge pull request #4447 from eileenmcnaughton/CRM-15299