Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 7475d7727f172387ac3d069887f3095dcb884649)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 190a79f462710f04d67eaefe498ef6ae5b7f5b1a) [Emil: drop VERSION hunk] Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Conflicts: VERSION