Merge pull request #4859 from eileenmcnaughton/CRM-15771-fix