Upstream version 20090213