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