Imported Upstream version 698.4
Merge tag 'upstream/698.4' into debian-debian

Upstream version 698.4
New upstream version