Upstream version 20090223