Merge pull request #13154 from civicrm/5.8
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 25 Nov 2018 20:03:36 +0000 (09:03 +1300)
committerGitHub <noreply@github.com>
Sun, 25 Nov 2018 20:03:36 +0000 (09:03 +1300)
5.8 to master


Trivial merge