Merge commit 'cf6341370837150ba9992bbf4fdcd89ea996af31' into eclair-sholes-release