Upstream version 2.24+dfsg