diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
index 01f82665ec5..7828dd97084 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
@@ -137,7 +137,7 @@ public abstract class BaseRuntimeElementDefinition<T extends IElement> {
 		for (RuntimeChildDeclaredExtensionDefinition next : myExtensions) {
 			String extUrl = next.getExtensionUrl();
 			if (myUrlToExtension.containsKey(extUrl)) {
-				throw new ConfigurationException("Duplicate extension URL: " + extUrl);
+				throw new ConfigurationException("Duplicate extension URL[" + extUrl + "] in Element[" + getName() + "]");
 			} else {
 				myUrlToExtension.put(extUrl, next);
 			}
diff --git a/hapi-fhir-structures-hl7org-dev/bin/.gitignore b/hapi-fhir-structures-hl7org-dev/bin/.gitignore
new file mode 100644
index 00000000000..ae3c1726048
--- /dev/null
+++ b/hapi-fhir-structures-hl7org-dev/bin/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/hapi-fhir-structures-hl7org-dev/bin/.project b/hapi-fhir-structures-hl7org-dev/bin/.project
new file mode 100644
index 00000000000..5ed54fe4349
--- /dev/null
+++ b/hapi-fhir-structures-hl7org-dev/bin/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>hapi-fhir-structures-hl7org-dev</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java
index c1785cbd862..3f68acc3b16 100644
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java
@@ -566,6 +566,11 @@ public class HumanNameDt
 		return this;
 	}
 
+	@Override
+	public StringDt getTextElement() {
+		return getText();
+	}
+
   
 
 
diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component
index 576cd601a1b..38e539885da 100644
--- a/restful-server-example/.settings/org.eclipse.wst.common.component
+++ b/restful-server-example/.settings/org.eclipse.wst.common.component
@@ -9,7 +9,7 @@
         <dependent-module archiveName="hapi-fhir-structures-dstu-0.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
+        <dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-testpage-overlay/0.8-SNAPSHOT/hapi-fhir-testpage-overlay-0.8-SNAPSHOT.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
             <dependency-type>consumes</dependency-type>
         </dependent-module>
         <dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
diff --git a/restful-server-example/src/main/java/ca/uhn/example/model/MyOrganization.java b/restful-server-example/src/main/java/ca/uhn/example/model/MyOrganization.java
index e1b8a677aa0..b3d44892bac 100644
--- a/restful-server-example/src/main/java/ca/uhn/example/model/MyOrganization.java
+++ b/restful-server-example/src/main/java/ca/uhn/example/model/MyOrganization.java
@@ -43,7 +43,7 @@ public class MyOrganization extends Organization {
 	 * of this file.
 	 */
 	@Description(shortDefinition="Contains emergency contact details")
-	@Extension(url = "http://foo#billingCode", isModifier = false, definedLocally = true)
+	@Extension(url = "http://foo#emergencyContact", isModifier = false, definedLocally = true)
 	@Child(name = "emergencyContact", min=0, max=Child.MAX_UNLIMITED)
 	private List<EmergencyContact> myEmergencyContact;