Follow new upstream version
Imported Upstream version 698.2
Merge tag 'upstream/698.2' into debian-debian

Upstream version 698.2