Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-sholes-release