Merge pull request #12648 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 12 Aug 2018 23:08:59 +0000 (11:08 +1200)
committerGitHub <noreply@github.com>
Sun, 12 Aug 2018 23:08:59 +0000 (11:08 +1200)
5.5 to master


Trivial merge