Updated from upstream, etc., removed parallel_find