Upstream version 20091019