Merge commit '49e8d2e9' into eclair