Upstream version 2.19+dfsg