Merge branch '5.18' of https://github.com/civicrm/civicrm-core into merge