GitLab

Fixes part of ticket3122
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5db49fc3)