Merge pull request #12759 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 2 Sep 2018 05:08:49 +0000 (17:08 +1200)
committerGitHub <noreply@github.com>
Sun, 2 Sep 2018 05:08:49 +0000 (17:08 +1200)
5.5 to master


Trivial merge