Upstream version 12.0+dfsg