Upstream version 20090225