Merge pull request #13274 from civicrm/5.9