Upstream version 2.74+dfsg