Merge change I4e9fe62b into eclair

* changes:
  do not merge -- original checkin to mr2 here: