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