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