Manual merge of eclair change I26548922 into master.
7 files changed