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