am 296f3b04: am 07e6da0b: am f81ecc1f: Merge change I29232f2a into eclair

Merge commit '296f3b048d348ef1eb58e7e47130bdb3f63164a3'

* commit '296f3b048d348ef1eb58e7e47130bdb3f63164a3':