Merge commit '263bdabc8770fed981bb52f8e3ff4110dfefc0e1' into eclair-sholes-release