From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 25 Nov 2018 20:03:36 +0000 (+1300)
Subject: Merge pull request #13154 from civicrm/5.8
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=116d9f2314af6564f90206980da67d733f2ce9dd;p=civicrm-core.git

Merge pull request #13154 from civicrm/5.8

5.8 to master
---

116d9f2314af6564f90206980da67d733f2ce9dd