am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2

Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
  Squashed commit of the following: