Upstream version 20091008