Upstream version 20090612