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

Upstream version 698.5
Upstream version 698.5