Change-Id: I2df53b2585875c4dc5fcba3012901530b963e70d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>