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