diff --git a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs
index 10809d18..c5bf884f 100644
--- a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("6.0.0.0")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.6.17819")]
+[assembly: AssemblyFileVersion("6.0.6.17820")]
diff --git a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs
index 3257ea26..bb64b4ff 100644
--- a/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs
+++ b/Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/CustomJsonReader.cs
@@ -4,88 +4,217 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
+using Newtonsoft.Json.Linq;
+#if NETFX_CORE
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#elif ASPNETCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
 
 namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
 {
     public class XmlJsonReader : JsonReader
     {
+        private readonly Stack<JTokenType> _stateStack;
         private readonly XmlReader _reader;
 
+        private JTokenType? _valueType;
+
         public XmlJsonReader(XmlReader reader)
         {
             _reader = reader;
+            _stateStack = new Stack<JTokenType>();
+        }
+
+        private JTokenType PeekState()
+        {
+            JTokenType current = (_stateStack.Count > 0) ? _stateStack.Peek() : JTokenType.None;
+            return current;
         }
 
         public override bool Read()
         {
-            if (!_reader.Read())
-                return false;
+            if (HandleValueType())
+                return true;
 
-            switch (_reader.NodeType)
+            while (_reader.Read())
             {
-                case XmlNodeType.Element:
-                    if (CurrentState == State.ObjectStart || CurrentState == State.Object)
-                    {
-                        SetToken(JsonToken.PropertyName, _reader.LocalName);
-                    }
-                    else
-                    {
-                        SetToken(JsonToken.StartObject);
-                    }
-                    break;
-                case XmlNodeType.Text:
-                case XmlNodeType.CDATA:
-                    SetToken(JsonToken.String, _reader.Value);
-                    break;
-                case XmlNodeType.Comment:
-                     SetToken(JsonToken.Comment, _reader.Value);
-                   break;
-                case XmlNodeType.Document:
-                    break;
-                case XmlNodeType.Whitespace:
-                case XmlNodeType.SignificantWhitespace:
-                    break;
-                case XmlNodeType.EndElement:
-                    break;
-                case XmlNodeType.EndEntity:
-                    break;
-                case XmlNodeType.XmlDeclaration:
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
+                switch (_reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        string typeName = _reader.GetAttribute("type");
+                        if (typeName == null)
+                            throw new Exception("No type specified.");
+
+                        _valueType = (JTokenType)Enum.Parse(typeof(JTokenType), typeName, true);
+
+                        switch (PeekState())
+                        {
+                            case JTokenType.None:
+                                HandleValueType();
+                                return true;
+                            case JTokenType.Object:
+                                SetToken(JsonToken.PropertyName, _reader.LocalName);
+                                _stateStack.Push(JTokenType.Property);
+                                return true;
+                            case JTokenType.Array:
+                            case JTokenType.Constructor:
+                                continue;
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
+                    case XmlNodeType.EndElement:
+                        switch (_stateStack.Peek())
+                        {
+                            case JTokenType.Object:
+                                SetToken(JsonToken.EndObject);
+                                _stateStack.Pop();
+                                if (PeekState() == JTokenType.Property)
+                                    _stateStack.Pop();
+                                return true;
+                            case JTokenType.Array:
+                                SetToken(JsonToken.EndArray);
+                                _stateStack.Pop();
+                                if (PeekState() == JTokenType.Property)
+                                    _stateStack.Pop();
+                                return true;
+                            case JTokenType.Constructor:
+                                SetToken(JsonToken.EndConstructor);
+                                _stateStack.Pop();
+                                if (PeekState() == JTokenType.Property)
+                                    _stateStack.Pop();
+                                return true;
+                        }
+
+                        _stateStack.Pop();
+                        if (PeekState() == JTokenType.Property)
+                            _stateStack.Pop();
+
+                        break;
+                    case XmlNodeType.Text:
+                    case XmlNodeType.CDATA:
+                        switch (_valueType)
+                        {
+                            case JTokenType.Integer:
+                                SetToken(JsonToken.Integer, Convert.ToInt64(_reader.Value));
+                                break;
+                            case JTokenType.Float:
+                                SetToken(JsonToken.Float, Convert.ToDouble(_reader.Value));
+                                break;
+                            case JTokenType.String:
+                            case JTokenType.Uri:
+                            case JTokenType.TimeSpan:
+                            case JTokenType.Guid:
+                                SetToken(JsonToken.String, _reader.Value);
+                                break;
+                            case JTokenType.Boolean:
+                                SetToken(JsonToken.Boolean, Convert.ToBoolean(_reader.Value));
+                                break;
+                            case JTokenType.Date:
+                                SetToken(JsonToken.Date, Convert.ToDateTime(_reader.Value));
+                                break;
+                            case JTokenType.Bytes:
+                                SetToken(JsonToken.Bytes, Convert.FromBase64String(_reader.Value));
+                                break;
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
+                        _stateStack.Push(_valueType.Value);
+                        return true;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
             }
 
-            return true;
+            return false;
+        }
+
+        private bool HandleValueType()
+        {
+            switch (_valueType)
+            {
+                case JTokenType.Null:
+                    SetToken(JsonToken.Null);
+                    _valueType = null;
+
+                    if (PeekState() == JTokenType.Property)
+                        _stateStack.Pop();
+                    return true;
+                case JTokenType.Object:
+                    SetToken(JsonToken.StartObject);
+                    _stateStack.Push(JTokenType.Object);
+                    _valueType = null;
+                    return true;
+                case JTokenType.Array:
+                    SetToken(JsonToken.StartArray);
+                    _stateStack.Push(JTokenType.Array);
+                    _valueType = null;
+                    return true;
+                case JTokenType.Constructor:
+                    string constructorName = _reader.GetAttribute("name");
+                    if (constructorName == null)
+                        throw new Exception("No constructor name specified.");
+
+                    SetToken(JsonToken.StartConstructor, constructorName);
+                    _stateStack.Push(JTokenType.Constructor);
+                    _valueType = null;
+                    return true;
+            }
+            return false;
         }
 
         public override int? ReadAsInt32()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (Value != null) ? (int?)Convert.ToInt32(Value) : null;
         }
 
         public override string ReadAsString()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (string)Value;
         }
 
         public override byte[] ReadAsBytes()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (byte[])Value;
         }
 
         public override decimal? ReadAsDecimal()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (Value != null) ? (decimal?)Convert.ToDecimal(Value) : null;
         }
 
         public override DateTime? ReadAsDateTime()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (Value != null) ? (DateTime?)Convert.ToDateTime(Value) : null;
         }
 
         public override DateTimeOffset? ReadAsDateTimeOffset()
         {
-            throw new NotImplementedException();
+            if (!Read())
+                return null;
+
+            return (Value != null) ? (DateTimeOffset?)Convert.ToDateTime(Value) : null;
         }
     }
 
@@ -93,41 +222,233 @@ namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
     {
         public void Example()
         {
-            #region Usage
-            StringBuilder sb = new StringBuilder();
-            StringWriter sw = new StringWriter(sb);
+            string xml = @"<Root type=""Object"">
+              <Null type=""Null"" />
+              <String type=""String"">This is a string!</String>
+              <Char type=""String"">!</Char>
+              <Integer type=""Integer"">123</Integer>
+              <DateTime type=""Date"">2001-02-22T20:59:59Z</DateTime>
+              <DateTimeOffset type=""Date"">2001-02-22T20:59:59+12:00</DateTimeOffset>
+              <Float type=""Float"">1.1</Float>
+              <Double type=""Float"">3.14</Double>
+              <Decimal type=""Float"">19.95</Decimal>
+              <Guid type=""Guid"">d66eab59-3715-4b35-9e06-fa61c1216eaa</Guid>
+              <Uri type=""Uri"">http://james.newtonking.com</Uri>
+              <Array type=""Array"">
+                <Item type=""Integer"">1</Item>
+                <Item type=""Bytes"">SGVsbG8gd29ybGQh</Item>
+                <Item type=""Boolean"">True</Item>
+              </Array>
+              <Object type=""Object"">
+                <String type=""String"">This is a string!</String>
+                <Null type=""Null"" />
+              </Object>
+              <Constructor type=""Constructor"" name=""Date"">
+                <Item type=""Integer"">2000</Item>
+                <Item type=""Integer"">12</Item>
+                <Item type=""Integer"">30</Item>
+              </Constructor>
+            </Root>";
 
-            using (JsonWriter writer = new JsonTextWriter(sw))
+            StringReader sr = new StringReader(xml);
+
+            using (XmlReader xmlReader = XmlReader.Create(sr, new XmlReaderSettings { IgnoreWhitespace = true }))
+            using (XmlJsonReader reader = new XmlJsonReader(xmlReader))
             {
-                writer.Formatting = Formatting.Indented;
-
-                writer.WriteStartObject();
-                writer.WritePropertyName("CPU");
-                writer.WriteValue("Intel");
-                writer.WritePropertyName("PSU");
-                writer.WriteValue("500W");
-                writer.WritePropertyName("Drives");
-                writer.WriteStartArray();
-                writer.WriteValue("DVD read/writer");
-                writer.WriteComment("(broken)");
-                writer.WriteValue("500 gigabyte hard drive");
-                writer.WriteValue("200 gigabype hard drive");
-                writer.WriteEnd();
-                writer.WriteEndObject();
+                JObject o = JObject.Load(reader);
+                //{
+                //  "Null": null,
+                //  "String": "This is a string!",
+                //  "Char": "!",
+                //  "Integer": 123,
+                //  "DateTime": "2001-02-23T09:59:59+13:00",
+                //  "DateTimeOffset": "2001-02-22T21:59:59+13:00",
+                //  "Float": 1.1,
+                //  "Double": 3.14,
+                //  "Decimal": 19.95,
+                //  "Guid": "d66eab59-3715-4b35-9e06-fa61c1216eaa",
+                //  "Uri": "http://james.newtonking.com",
+                //  "Array": [
+                //    1,
+                //    "SGVsbG8gd29ybGQh",
+                //    true
+                //  ],
+                //  "Object": {
+                //    "String": "This is a string!",
+                //    "Null": null
+                //  },
+                //  "Constructor": new Date(2000, 12, 30)
+                //}
             }
 
-            Console.WriteLine(sb.ToString());
-            // {
-            //   "CPU": "Intel",
-            //   "PSU": "500W",
-            //   "Drives": [
-            //     "DVD read/writer"
-            //     /*(broken)*/,
-            //     "500 gigabyte hard drive",
-            //     "200 gigabype hard drive"
-            //   ]
-            // }
-            #endregion
+            using (XmlReader xmlReader = XmlReader.Create(new StringReader(xml), new XmlReaderSettings { IgnoreWhitespace = true }))
+            using (XmlJsonReader reader = new XmlJsonReader(xmlReader))
+            {
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Null", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Null, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("String", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.String, reader.TokenType);
+                Assert.AreEqual("This is a string!", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Char", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.String, reader.TokenType);
+                Assert.AreEqual("!", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Integer", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+                Assert.AreEqual(123, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("DateTime", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Date, reader.TokenType);
+                Assert.AreEqual(DateTime.Parse("2001-02-22T20:59:59Z"), reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("DateTimeOffset", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Date, reader.TokenType);
+                Assert.AreEqual(DateTime.Parse("2001-02-22T20:59:59+12:00"), reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Float", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Float, reader.TokenType);
+                Assert.AreEqual(1.1d, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Double", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Float, reader.TokenType);
+                Assert.AreEqual(3.14d, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Decimal", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Float, reader.TokenType);
+                Assert.AreEqual(19.95d, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Guid", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.String, reader.TokenType);
+                Assert.AreEqual("d66eab59-3715-4b35-9e06-fa61c1216eaa", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Uri", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.String, reader.TokenType);
+                Assert.AreEqual("http://james.newtonking.com", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Array", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
+
+                Assert.AreEqual(1, reader.ReadAsInt32());
+                Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+                Assert.AreEqual(1, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
+                Assert.AreEqual(Encoding.UTF8.GetBytes("Hello world!"), reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Boolean, reader.TokenType);
+                Assert.AreEqual(true, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Object", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("String", reader.Value);
+
+                Assert.AreEqual("This is a string!", reader.ReadAsString());
+                Assert.AreEqual(JsonToken.String, reader.TokenType);
+                Assert.AreEqual("This is a string!", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Null", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Null, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
+                Assert.AreEqual("Constructor", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.StartConstructor, reader.TokenType);
+                Assert.AreEqual("Date", reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+                Assert.AreEqual(2000, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+                Assert.AreEqual(12, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.Integer, reader.TokenType);
+                Assert.AreEqual(30, reader.Value);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.EndConstructor, reader.TokenType);
+
+                Assert.IsTrue(reader.Read());
+                Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
+
+                Assert.IsFalse(reader.Read());
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs
index 944388d3..c6d33719 100644
--- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs
+++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs
@@ -521,7 +521,7 @@ third line", jsonTextReader.Value);
 ]content";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[2]);
 #endif
 
@@ -590,7 +590,7 @@ third line", jsonTextReader.Value);
 
             using (JsonTextReader jsonReader = new JsonTextReader(sr))
             {
-#if DEBUG && !NOINTERNALS
+#if DEBUG
                 jsonReader.SetCharBuffer(new char[5]);
 #endif
 
@@ -908,7 +908,7 @@ third line", jsonTextReader.Value);
 ]";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[129]);
 #endif
 
@@ -1023,7 +1023,7 @@ third line", jsonTextReader.Value);
 ";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[129]);
 #endif
 
@@ -1566,7 +1566,7 @@ third line", jsonTextReader.Value);
             string json = @"[""\u003c"",""\u5f20""]";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[2]);
 #endif
 
@@ -1898,7 +1898,7 @@ third line", jsonTextReader.Value);
             string json = @"{""Message"":""Hi,I\u0092ve send you smth""}";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[5]);
 #endif
 
@@ -2255,7 +2255,7 @@ third line", jsonTextReader.Value);
 ]";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[5]);
 #endif
 
@@ -2283,7 +2283,7 @@ third line", jsonTextReader.Value);
       } /*comment*/";
 
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[5]);
 #endif
 
@@ -2303,7 +2303,7 @@ third line", jsonTextReader.Value);
         {
             string json = "new Date\0()";
             JsonTextReader reader = new JsonTextReader(new StringReader(json));
-#if DEBUG && !NOINTERNALS
+#if DEBUG
             reader.SetCharBuffer(new char[7]);
 #endif
 
diff --git a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs
index cfa4fbc9..b0335bed 100644
--- a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs
+++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs
@@ -884,13 +884,24 @@ namespace Newtonsoft.Json.Tests
                 Assert.AreEqual('\'', jsonWriter.QuoteChar);
 
                 jsonWriter.WriteStartObject();
+
                 jsonWriter.WritePropertyName("propertyName");
                 jsonWriter.WriteValue(double.NaN);
+
+                jsonWriter.IndentChar = '?';
+                Assert.AreEqual('?', jsonWriter.IndentChar);
+                jsonWriter.Indentation = 6;
+                Assert.AreEqual(6, jsonWriter.Indentation);
+
+                jsonWriter.WritePropertyName("prop2");
+                jsonWriter.WriteValue(123);
+
                 jsonWriter.WriteEndObject();
             }
 
             string expected = @"{
-_____'propertyName': NaN
+_____'propertyName': NaN,
+??????'prop2': 123
 }";
             string result = sb.ToString();
 
diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
index 04b4fcb0..c5efbbcf 100644
--- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
@@ -74,4 +74,4 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.6.17819")]
+[assembly: AssemblyFileVersion("6.0.6.17820")]
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index 1493fc67..6e9f4f5a 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -7128,7 +7128,7 @@ To fix this error either change the environment to be fully trusted, change the
 #endif
         }
 
-#if DEBUG && !NOINTERNALS
+#if DEBUG
         [Test]
         public void SerializeCustomTupleWithSerializableAttributeInPartialTrust()
         {
diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
index d6b8547b..5c8bc83c 100644
--- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
@@ -91,5 +91,5 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.6.17819")]
+[assembly: AssemblyFileVersion("6.0.6.17820")]
 [assembly: CLSCompliant(true)]