Upstream version 20090309