Merged the fix for Debian bug #385976.