Merge pull request #16226 from civicrm/5.22
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 7 Jan 2020 23:08:13 +0000 (12:08 +1300)
committerGitHub <noreply@github.com>
Tue, 7 Jan 2020 23:08:13 +0000 (12:08 +1300)
5.22 to master


Trivial merge