am 48b0f0d8: am c38f6f33: am c15934f2: Merge change I7a57637b into eclair

Merge commit '48b0f0d8c0ac6761a2f6069287d86d21c526eb84'

* commit '48b0f0d8c0ac6761a2f6069287d86d21c526eb84':