Merge branch '2.6'

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java

Author: cowtowncoder

release-notes/VERSION

@@ -65,6 +65,8 @@ INCOMPATIBILITIES:
 
 2.6.5 (not yet released)
 
+#1052: Don't generate a spurious NullNode after parsing an embedded object
+ (reported by philipa@github)
 #1061: Problem with Object Id and Type Id as Wrapper Object (regression in 2.5.1)
 
 2.6.4 (07-Dec-2015)