Upstream version 20091013