Merge pull request #16420 from civicrm/5.22
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 29 Jan 2020 19:55:00 +0000 (08:55 +1300)
committerGitHub <noreply@github.com>
Wed, 29 Jan 2020 19:55:00 +0000 (08:55 +1300)
5.22 to master


Trivial merge