Merge pull request #15357 from civicrm/5.18