Merge pull request #13894 from civicrm/5.12