Merge pull request #13834 from civicrm/5.12