From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 24 Oct 2018 19:25:12 +0000 (+1300)
Subject: Merge pull request #13002 from civicrm/5.7
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5143ab6f308325c4992c65a19c04d73050eca402;p=civicrm-core.git

Merge pull request #13002 from civicrm/5.7

5.7 to master
---

5143ab6f308325c4992c65a19c04d73050eca402