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