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