Merge remote-tracking branch 'origin/5.5'
authorTim Otten <totten@civicrm.org>
Thu, 2 Aug 2018 01:26:48 +0000 (18:26 -0700)
committerTim Otten <totten@civicrm.org>
Thu, 2 Aug 2018 01:26:48 +0000 (18:26 -0700)

Trivial merge