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