Merge branch '5.6' of https://github.com/civicrm/civicrm-core
authoreileen <emcnaughton@wikimedia.org>
Thu, 20 Sep 2018 22:48:29 +0000 (10:48 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 20 Sep 2018 22:48:29 +0000 (10:48 +1200)
Change-Id: I2dd0a9d8f83fe13b7f731db0b959a67e3dd0ae9f


Trivial merge