am 3e738a80: am 1bf3b382: am e19d06c1: Merge change I92d49bcd into eclair

Merge commit '3e738a8086a41c030dce4904134f33e0a3037a1f'

* commit '3e738a8086a41c030dce4904134f33e0a3037a1f':