diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
index 615fe7b63ad..99dbe62aab3 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
@@ -34,6 +34,7 @@ import ca.uhn.fhir.i18n.HapiLocalizer;
 import ca.uhn.fhir.model.api.IElement;
 import ca.uhn.fhir.model.api.IFhirVersion;
 import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.dstu.resource.Binary;
 import ca.uhn.fhir.model.view.ViewGenerator;
 import ca.uhn.fhir.narrative.INarrativeGenerator;
 import ca.uhn.fhir.parser.DataFormatException;
@@ -167,7 +168,12 @@ public class FhirContext {
 			try {
 				String className = myNameToResourceType.get(resourceName.toLowerCase());
 				if (className == null) {
-					throw new DataFormatException("Unknown resource name[" + resourceName + "]");
+					if ("binary".equals(resourceName.toLowerCase())) {
+						// Binary is not generated so it's not in the list of potential resources
+						className = Binary.class.getName();
+					} else {
+						throw new DataFormatException("Unknown resource name[" + resourceName + "]");
+					}
 				}
 				Class<?> clazz = Class.forName(className);
 				if (IResource.class.isAssignableFrom(clazz)) {
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
index 19de6ce35ea..27a79e6d770 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
@@ -37,6 +37,11 @@ import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
 
 /**
  * Provides methods to intercept requests and responses. Note that implementations of this interface may wish to use {@link InterceptorAdapter} in order to not need to implement every method.
+ * <p>
+ * <b>See:</b> See the 
+ * <a href="http://jamesagnew.github.io/hapi-fhir/doc_rest_server_interceptor.html">server interceptor documentation</a>
+ * for more information on how to use this class.
+ * </p>
  */
 public interface IServerInterceptor {
 
diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component b/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component
index b5d99862419..bb633a08b36 100644
--- a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component
+++ b/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="hapi-fhir-structures-dstu">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/" source-path="/src/test/resources"/>
         <wb-resource deploy-path="/" source-path="/target/generated-resources/tinder"/>
         <wb-resource deploy-path="/" source-path="/target/generated-sources/tinder"/>
     </wb-module>
diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextTest.java
index 2df0eefba6a..cd5f1174cd6 100644
--- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextTest.java
+++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/FhirContextTest.java
@@ -1,5 +1,7 @@
 package ca.uhn.fhir.context;
 
+import static org.junit.Assert.*;
+
 import org.junit.Test;
 
 import ca.uhn.fhir.model.dstu.resource.Patient;
@@ -15,4 +17,10 @@ public class FhirContextTest {
 		ctx.getResourceDefinition(Patient.class);
 	}
 	
+	@Test
+	public void testFindBinary() {
+		RuntimeResourceDefinition def = new FhirContext().getResourceDefinition("Binary");
+		assertEquals("Binary", def.getName());
+	}
+	
 }
diff --git a/pom.xml b/pom.xml
index 8fa1c6ff697..074ef1fad9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -631,7 +631,7 @@
 			<modules>
 				<module>hapi-deployable-pom</module>
 				<module>hapi-fhir-base</module>
-				<module>hapi-fhir-oauth2</module>
+				<!--<module>hapi-fhir-oauth2</module>-->
 				<module>hapi-fhir-base/testmindeps</module>
 				<module>hapi-tinder-plugin</module>
 				<module>hapi-tinder-test</module>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 77f3f84edba..56d16e85394 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -15,6 +15,21 @@
 				<![CDATA[<a href="./doc_upgrading.html">upgrading</a>]]> 
 				for more information.  
 			</action>
+			<action type="fix">
+				<![CDATA[
+					<b>Deprocated API Removal</b>: The following classes (which were deprocated previously)
+					have now been removed:
+					<ul>
+						<li><b>ISecurityManager</b>: If you are using this class, the same functionality
+						is available through the more general purpose
+						<a href="http://jamesagnew.github.io/hapi-fhir/doc_rest_server_interceptor.html">server interceptor</a>
+						capabilities.
+						<li><b>CodingListParam</b>: This class was made redundant by the
+						<a href="http://jamesagnew.github.io/hapi-fhir/apidocs/ca/uhn/fhir/rest/param/TokenOrListParam.html">TokenOrListParam</a>
+						class, which can be used in its place.
+					</ul>
+				]]> 
+			</action>			
 			<action type="add" issue="38" dev="wdebeau1">
 				Profile generation on the server was not working due to IdDt being
 				incorrectly used. Thanks to Bill de Beaubien for the pull request!