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

Merge pull request #10074 from eileenmcnaughton/master

Merge from 4.7.18rc
---

e655358de649254e181d53ec62e4fae373fcd5fa