Changes from NMU to fix FTBFS

I uploaded an NMU to fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926381

This branch has the changes.

Ivo