(cherry picked from commit fb8075f2fac2b83f58d8e286b0b210a7b67d1ee6)
Signed-off-by: Ilkka Ollakka <ileoo@iki.fi>