Merge pull request #10025 from civicrm/JoeMurray-patch-1