From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 13 Dec 2018 00:54:40 +0000 (+1300)
Subject: Merge pull request #13264 from civicrm/5.9
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b86845e513746bedc91ffff4c7fc3f336ff1ee0f;p=civicrm-core.git

Merge pull request #13264 from civicrm/5.9

5.9 to master
---

b86845e513746bedc91ffff4c7fc3f336ff1ee0f