Merge pull request #4009 from eileenmcnaughton/CRM-15210