Merge pull request #13130 from civicrm/5.8
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 20 Nov 2018 00:10:05 +0000 (13:10 +1300)
committerGitHub <noreply@github.com>
Tue, 20 Nov 2018 00:10:05 +0000 (13:10 +1300)
5.8 to master


Trivial merge