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