Imported Upstream version 1.5.4+dfsg
Merge tag 'upstream/1.5.4+dfsg'

Upstream version 1.5.4+dfsg
Release new version.