Merge pull request #13817 from civicrm/5.12