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