Upstream version 20090215