Merge pull request #15026 from civicrm/5.17
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 12 Aug 2019 23:21:43 +0000 (11:21 +1200)
committerGitHub <noreply@github.com>
Mon, 12 Aug 2019 23:21:43 +0000 (11:21 +1200)
5.17 to master


Trivial merge