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