Merge commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9' * commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9': eclair snapshot