Upstream version 20090915