Upstream version 2.5+dfsg1