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