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