Merge pull request #12985 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 22 Oct 2018 23:34:14 +0000 (12:34 +1300)
committerGitHub <noreply@github.com>
Mon, 22 Oct 2018 23:34:14 +0000 (12:34 +1300)
5.7 to master


Trivial merge