Merge pull request #12644 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 11 Aug 2018 02:12:00 +0000 (14:12 +1200)
committerGitHub <noreply@github.com>
Sat, 11 Aug 2018 02:12:00 +0000 (14:12 +1200)
5.5 to master


Trivial merge