Merge change I386dd954 into eclair

* changes:
  Remove GAIA string