Merge branch '2.6' into 2.7
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 2ff0fd1..8dfb151 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -87,7 +87,7 @@
 - Add `JsonParser.Feature.IGNORE_UNDEFINED`, useful for data formats like protobuf
 - Optimize writing of String names (remove intermediate copy; with JDK7 no speed benefit)
 
-2.5.5 (not yet released)
+2.5.5 (07-Dec-2015)
 
 #220: Problem with `JsonParser.nextFieldName(SerializableString)` for byte-backed parser
 #221: Fixed ArrayIndexOutOfBounds exception for character-based `JsonGenerator`
diff --git a/src/main/java/com/fasterxml/jackson/core/Version.java b/src/main/java/com/fasterxml/jackson/core/Version.java
index e43a684..02f3de8 100644
--- a/src/main/java/com/fasterxml/jackson/core/Version.java
+++ b/src/main/java/com/fasterxml/jackson/core/Version.java
@@ -68,6 +68,7 @@
      * @since 2.7 to replace misspelled {@link #isUknownVersion()}
      */
     public boolean isUnknownVersion() { return (this == UNKNOWN_VERSION); }
+
     public boolean isSnapshot() { return (_snapshotInfo != null && _snapshotInfo.length() > 0); }
 
     /**