Merge pull request #15933 from civicrm/5.20