Upstream version 2008