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