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