Merge pull request #13145 from civicrm/5.8
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 21 Nov 2018 19:54:13 +0000 (08:54 +1300)
committerGitHub <noreply@github.com>
Wed, 21 Nov 2018 19:54:13 +0000 (08:54 +1300)
5.8 to master


Trivial merge