am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2

Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'

* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
  Squashed commit of the following: