Merge pull request #12743 from civicrm/5.5
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 29 Aug 2018 00:49:59 +0000 (12:49 +1200)
committerGitHub <noreply@github.com>
Wed, 29 Aug 2018 00:49:59 +0000 (12:49 +1200)
5.5 to master


Trivial merge