Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit bed7e62a0d)
bed7e62a0d