Upstream version 6+20090307