Upstream version 2.10+dfsg