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