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