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