Merge pull request #13152 from civicrm/5.8
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)
committerGitHub <noreply@github.com>
Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)
5.8 to master


Trivial merge