Merge pull request #9805 from civicrm/eileenmcnaughton-patch-1