Upstream version 20090609