Merge pull request #12911 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 9 Oct 2018 13:23:34 +0000 (14:23 +0100)
committerGitHub <noreply@github.com>
Tue, 9 Oct 2018 13:23:34 +0000 (14:23 +0100)
5.7 to master


Trivial merge