Merge pull request #12964 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 19 Oct 2018 00:22:47 +0000 (13:22 +1300)
committerGitHub <noreply@github.com>
Fri, 19 Oct 2018 00:22:47 +0000 (13:22 +1300)
5.7 to master


Trivial merge