Merge commit 'c646fe8b08544a5a317e2984f73bfa8044a97354' * commit 'c646fe8b08544a5a317e2984f73bfa8044a97354': eclair snapshot