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