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