Merge pull request #4071 from eileenmcnaughton/CRM-15259