From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 29 Apr 2018 07:47:24 +0000 (+1200)
Subject: Merge pull request #12053 from civicrm/5.1
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=daa46b94db74b842b7d7c6be293401672b637e7f;p=civicrm-core.git

Merge pull request #12053 from civicrm/5.1

merge 5.1 to master
---

daa46b94db74b842b7d7c6be293401672b637e7f