Merge commit 'eec04663feb74ead2c9a1cb6942da57493740230' into eclair-sholes-release