am 8c1b7e6d: merge from open-source master

Merge commit '8c1b7e6d0d0255a95e1de77fd850ba12d00f2816'

* commit '8c1b7e6d0d0255a95e1de77fd850ba12d00f2816':
  eclair snapshot