Imported Upstream version 3.1.8
Merge tag 'upstream/3.1.8'

Upstream version 3.1.8
Update debian/changelog file