am a8203875: am 48289b2e: am 7c12540f: Merge change Ibd2197fb into eclair

Merge commit 'a8203875ed99246f79847b10b6fa84f16cc1e57a'

* commit 'a8203875ed99246f79847b10b6fa84f16cc1e57a':