Upstream version 2.73+dfsg