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