GitLab

Add patch cherry-picked from upstream.

Closes: #962724
Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org>