am bd0131f2: merge from open-source master

Merge commit 'bd0131f2207080d95ea3ea493f228085024e9369'

* commit 'bd0131f2207080d95ea3ea493f228085024e9369':
  eclair snapshot