Merge pull request #12948 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 17 Oct 2018 19:12:59 +0000 (08:12 +1300)
committerGitHub <noreply@github.com>
Wed, 17 Oct 2018 19:12:59 +0000 (08:12 +1300)
5.7 to master


Trivial merge