Upstream version 2+20090319