am 4ff417cb: merge from open-source master

Merge commit '4ff417cb390f15651e9c4195410d023b3547fc79'

* commit '4ff417cb390f15651e9c4195410d023b3547fc79':
  eclair snapshot