From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 20 Aug 2019 19:55:04 +0000 (+1200)
Subject: Merge pull request #15088 from civicrm/5.17
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4732d6b76de6d43cda08b957e53d965f713ef476;p=civicrm-core.git

Merge pull request #15088 from civicrm/5.17

5.17 to master
---

4732d6b76de6d43cda08b957e53d965f713ef476