Merge commit 'e2886eebee1759509602bf391ff7087279115c6b' into eclair-sholes-release