From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 29 Mar 2017 06:58:06 +0000 (+1300)
Subject: Merge pull request #10076 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=76076147aa2ccca4419a16bdf97c5370d7cb1e8e;p=civicrm-core.git

Merge pull request #10076 from eileenmcnaughton/master

Merge to master from 4.7.18rc
---

76076147aa2ccca4419a16bdf97c5370d7cb1e8e