am 40f40448: merge from open-source master

Merge commit '40f40448c9c00615e643f3057a657e61c246544a'

* commit '40f40448c9c00615e643f3057a657e61c246544a':
  eclair snapshot