Imported Upstream version 3.1.5
Merge tag 'upstream/3.1.5'

Upstream version 3.1.5
Update debian/changelog file