Upstream version 20090105