Patch taken from Debian. Refresh patches Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 78b0106f7d)
78b0106f7d