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