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