Merge pull request #1353 from eileenmcnaughton/CRM-13162