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