Change-Id: If084739b81ab7486d667eabb665a272bc9020d2e Reviewed-by: Daniel Teske <daniel.teske@digia.com>