Merge tag '1.5.4' into debian/xenial

Upstream version 1.5.4