From: Martin <martinh@peaceworks.ca>
Date: Fri, 4 Jan 2019 15:49:08 +0000 (-0500)
Subject: Merge pull request #1 from civicrm/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d92d9d62d0d206a19efe768100f7bd7d4e1de0ea;p=civicrm-core.git

Merge pull request #1 from civicrm/master

Update master from upstream
---

d92d9d62d0d206a19efe768100f7bd7d4e1de0ea