Merge branch 'eclair' into eclair-release