Merge pull request #15372 from civicrm/5.18