am 68f857cd: am dc76d696: am 9e2562b8: Merge change I88c6e267 into eclair

Merge commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8'

* commit '68f857cd442c2e9b91ffb5111a5fbae7ac72edc8':