Upstream version 4.0+dfsg