From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 13 Mar 2019 19:13:11 +0000 (+1300)
Subject: Merge pull request #13817 from civicrm/5.12
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=425f32c1b77c3c90cd703f32d19e5e874f18c650;p=civicrm-core.git

Merge pull request #13817 from civicrm/5.12

5.12 to master
---

425f32c1b77c3c90cd703f32d19e5e874f18c650