Merge pull request #12894 from seamuslee001/5.7
authorTim Otten <totten@civicrm.org>
Wed, 3 Oct 2018 21:39:59 +0000 (17:39 -0400)
committerGitHub <noreply@github.com>
Wed, 3 Oct 2018 21:39:59 +0000 (17:39 -0400)
5.7


Trivial merge