From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 9 Oct 2018 13:23:34 +0000 (+0100)
Subject: Merge pull request #12911 from civicrm/5.7
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9cf3130c382c1197b342da6a6987a71532d7b236;p=civicrm-core.git

Merge pull request #12911 from civicrm/5.7

5.7 to master
---

9cf3130c382c1197b342da6a6987a71532d7b236