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