Merge pull request #13193 from civicrm/5.8