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