Merge branch '2.5'

Conflicts:
	release-notes/CREDITS

Author: cowtowncoder

release-notes/CREDITS

@@ -250,6 +250,11 @@ Charles Allen:
     `Thread.currentThread().getContextClassLoader()`
    (2.5.4)
 
+Kamil Benedykciński (Kamil-Benedykcinski@github)
+  * Contributed #801: Using `@JsonCreator` cause generating invalid path reference
+   in `JsonMappingException`
+   (2.5.4)
+
 Charles Allen (drcrallen@github):
   * Reported #696: Copy constructor does not preserve `_injectableValues`
    (2.6.0)
@@ -276,4 +281,3 @@ Jeff Schnitzer (stickfigure@github)
   * Suggested #504: Add `DeserializationFeature.USE_LONG_FOR_INTS`
    (2.6.0)
 
-

release-notes/VERSION

@@ -71,6 +71,8 @@ Project: jackson-databind
 #792: Ensure Constructor Parameter annotations are linked with those of Field, Getter, or Setter
 #793: `ObjectMapper.readTree()` does not work with defaultTyping enabled
  (reported by gracefulgopher@github)
+#801: Using `@JsonCreator` cause generating invalid path reference in `JsonMappingException`
+ (contributed by Kamil B)
 - Fix handling of Enums wrt JSON Schema, when 'toString()' used for serialization
 
 2.5.3 (24-Apr-2015)