From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 24 Jul 2018 11:34:13 +0000 (+1200)
Subject: Merge pull request #12551 from seamuslee001/missed_54_commits
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=01135550053b62eae26e1fcab430c57675871fb8;p=civicrm-core.git

Merge pull request #12551 from seamuslee001/missed_54_commits

Included missed 5.3 commits
---

01135550053b62eae26e1fcab430c57675871fb8