Merge pull request #4295 from eileenmcnaughton/CRM-15408