Merge change Iea6a38c6 into eclair-mr2

* changes:
  Squashed commit of the following: