Merge pull request #12895 from civicrm/5.7
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 5 Oct 2018 02:32:15 +0000 (12:32 +1000)
committerGitHub <noreply@github.com>
Fri, 5 Oct 2018 02:32:15 +0000 (12:32 +1000)
5.7


Trivial merge