GitLab

This patch is cherry-picked from upstream.

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