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