Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 4efd5cf34b7a04f87805aa0f09913d1d122d300c)
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 50196a982bf7c8be9b41053fa0975473c217e709)