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