am 862c6a9c: merge from open-source master

Merge commit '862c6a9c67b094565c1b4a1a1bdc1470aaa63579'

* commit '862c6a9c67b094565c1b4a1a1bdc1470aaa63579':
  eclair snapshot