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