am 9ee55cc1: am 2d6d609c: Merge change I74bf38a0 into eclair-mr2

Merge commit '9ee55cc1bc6878b243134a558d583786d9215958'

* commit '9ee55cc1bc6878b243134a558d583786d9215958':
  Squashed commit of the following: