am 381f3fbc: am 197ef85e: am e5608f5e: Merge change Ied958262 into eclair

Merge commit '381f3fbca8ce2cab4b056a5bfb27457ddd040e51'

* commit '381f3fbca8ce2cab4b056a5bfb27457ddd040e51':