Merge pull request #15348 from civicrm/5.18