Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-sholes-release