Upstream version 2.70+dfsg