Merge pull request #13094 from civicrm/5.8