am 3006d019: merge from open-source master

Merge commit '3006d019e19a571612ef7da9a32886ffaaa42f6c'

* commit '3006d019e19a571612ef7da9a32886ffaaa42f6c':
  eclair snapshot