Merge pull request #13446 from civicrm/5.10