Upstream version 2.18+dfsg