Merge pull request #12907 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 9 Oct 2018 05:30:48 +0000 (06:30 +0100)
committerGitHub <noreply@github.com>
Tue, 9 Oct 2018 05:30:48 +0000 (06:30 +0100)
5.7


Trivial merge