Upstream version 6+20091202