Upstream version 20090622