Merge pull request #12760 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 3 Sep 2018 00:18:04 +0000 (12:18 +1200)
committerGitHub <noreply@github.com>
Mon, 3 Sep 2018 00:18:04 +0000 (12:18 +1200)
5.5 to master


Trivial merge