Merge pull request #4272 from eileenmcnaughton/CRM-15296-complete