Pull downstream fixes from Debian package 1.0.5-2: