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