Auto stash before merge of "master" and "origin/master"

Author: Grahame Grieve

library/ftx/ftx_service.pas

@@ -697,6 +697,12 @@ function TConceptDesignations.displayCount(langList : THTTPLanguageList; defLang
   if result = 0 then
     for cd in FDesignations do
       if (not displayOnly or cd.base or isDisplay(cd)) and langsMatch(langList, cd.language, lmtLangRegion, defLang) and (cd.value <> nil) then
+      begin
+        inc(result);
+      end;        
+  if result = 0 then
+    for cd in FDesignations do
+      if (not displayOnly or cd.base or isDisplay(cd)) and langsMatch(langList, cd.language, lmtLang, defLang) and (cd.value <> nil) then
       begin
         inc(result);
       end;

server/fhirserver.lpi

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -1001,7 +1002,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class&gt;"/>
+        <Name Value="&lt;Unknown Class>"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>

server/tx_operations.pas

@@ -1847,7 +1847,7 @@ function TFhirTerminologyOperation.loadCoded(request : TFHIRRequest; loadType :
     end;
   end
   else
-    raise ETerminologyError.Create('Unable to find code to validate (looked for coding | codeableConcept | code+system in parameters ='+request.Parameters.Source+')', itNotFound);
+    raise ETerminologyError.Create('Unable to find code to validate (looked for coding | codeableConcept | code+system | code+inferSystem in parameters ='+request.Parameters.Source+')', itNotFound);
 end;
 
 function TFhirTerminologyOperation.loadCoded(params : TFHIRParametersW; loadType : TLoadCodedType; var issuePath : string; var mode : TValidationCheckMode): TFhirCodeableConceptW;