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