From 2c2ba54c0a24a3c9dc47a1bfb9fd44d8f025a6fe Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 18 Oct 2017 16:46:19 -0400
Subject: [PATCH 1/2] Fix #765 - Remove "Test" resource

---
 hapi-fhir-structures-dstu2/pom.xml | 2 +-
 src/changes/changes.xml            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index eb4e7e82391..a2e003673ef 100644
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@@ -318,8 +318,8 @@
 								<!--
 									Removed in HAPI 2.4 as this isn't a real resource
 									<baseResourceName>supportingdocumentation</baseResourceName>
+									<baseResourceName>test</baseResourceName>
 								-->
-								<baseResourceName>test</baseResourceName>
 								<baseResourceName>testscript</baseResourceName>
 								<baseResourceName>user</baseResourceName>
 								<baseResourceName>valueset</baseResourceName>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 63026091e2b..a830c532951 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -120,6 +120,11 @@
 				resolved when validating QuestionnaireResponse answers with a type
 				of "choice" where the choice was bound to a ValueSet.
 			</action>
+			<action type="fix">
+				Remove the fake "Test" resource from DSTU2 structures. This was not
+				a real resource type, and caused conflicts with the .NET client. Thanks to
+				Vlad Ignatov for reporting!
+			</action>
 		</release>
 		<release version="3.0.0" date="2017-09-27">
 			<action type="add">

From 5f5475fb1705dc84c7301368af45c91f20d2a25e Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 18 Oct 2017 17:33:52 -0400
Subject: [PATCH 2/2] Missed a file in previous commit

---
 .../resources/ca/uhn/fhir/model/dstu2/fhirversion.properties     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hapi-tinder-plugin/src/main/resources/ca/uhn/fhir/model/dstu2/fhirversion.properties b/hapi-tinder-plugin/src/main/resources/ca/uhn/fhir/model/dstu2/fhirversion.properties
index 0e8c4e7e745..5534dddc601 100644
--- a/hapi-tinder-plugin/src/main/resources/ca/uhn/fhir/model/dstu2/fhirversion.properties
+++ b/hapi-tinder-plugin/src/main/resources/ca/uhn/fhir/model/dstu2/fhirversion.properties
@@ -91,7 +91,6 @@ resource.Subscription=ca.uhn.fhir.model.dstu2.resource.Subscription
 resource.Substance=ca.uhn.fhir.model.dstu2.resource.Substance
 resource.SupplyDelivery=ca.uhn.fhir.model.dstu2.resource.SupplyDelivery
 resource.SupplyRequest=ca.uhn.fhir.model.dstu2.resource.SupplyRequest
-resource.Test=ca.uhn.fhir.model.dstu2.resource.Test
 resource.TestScript=ca.uhn.fhir.model.dstu2.resource.TestScript
 resource.User=ca.uhn.fhir.model.dstu2.resource.User
 resource.ValueSet=ca.uhn.fhir.model.dstu2.resource.ValueSet