Merge pull request #10707 from eileenmcnaughton/civimail