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


Trivial merge