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