am efe211de: merge from open-source master

Merge commit 'efe211de2fd3b7c427e69496c708542d660d29c0'

* commit 'efe211de2fd3b7c427e69496c708542d660d29c0':
  eclair snapshot