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