Upstream version 20090816