Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit d7a3120cdcc1aeed5a95636803d250e35ba8706e)