Merge change Ie9e5982e into eclair

* changes:
  Remove GAIA string