am 50c57b4e: merge from open-source master

Merge commit '50c57b4e23ee626c7e6cd98fe700444416e32ea6'

* commit '50c57b4e23ee626c7e6cd98fe700444416e32ea6':
  eclair snapshot