Upgrade surveyor to fix problem evaluating dependencies. #3032