Merge branch '2.7'

Conflicts:
	release-notes/CREDITS
	release-notes/VERSION

Author: cowtowncoder

release-notes/CREDITS

@@ -445,6 +445,10 @@ Tom Mack (tommack@github)
     the requested value type
    (2.7.4)
 
+Nick Babcock (nickbabcock)
+  * Reported #1225: `JsonMappingException` should override getProcessor()
+   (2.7.5)
+
 Artur Jonkisz (ajonkisz@github)
   * Reported #960: `@JsonCreator` not working on a factory with no arguments for ae enum type
    (2.8.0)
@@ -465,3 +469,4 @@ Lokesh Kumar (LokeshN@github)
    (2.8.0)
   * Reported #1217: `@JsonIgnoreProperties` on Pojo fields not working for deserialization
    (2.8.0)
+

release-notes/VERSION

@@ -34,6 +34,11 @@ Project: jackson-databind
  (reported by Lokesh K)
 #1221: Use `Throwable.addSuppressed()` directly and/or via try-with-resources
 
+2.7.5 (not yet released)
+
+#1225: `JsonMappingException` should override getProcessor()
+ (reported by Nick B)
+
 2.7.4 (29-Apr-2016)
 
 #1122: Jackson 2.7 and Lombok: 'Conflicting/ambiguous property name definitions'

src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java

@@ -454,6 +454,9 @@ public void prependPath(Reference r)
     /**********************************************************
      */
 
+    @Override // since 2.7.5
+    public Object getProcessor() { return _processor; }
+
     @Override
     public String getLocalizedMessage() {
         return _buildMessage();