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