Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2611e520)