diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue1545.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue1545.cs
index 02888c4a..46b67e0b 100644
--- a/Src/Newtonsoft.Json.Tests/Issues/Issue1545.cs
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue1545.cs
@@ -39,9 +39,9 @@ namespace Newtonsoft.Json.Tests.Issues
     public class Issue1545 : TestFixtureBase
     {
         [Test]
-        public void Test()
+        public void Test_Populate()
         {
-            var json = @"{
+            string json = @"{
                 ""array"": [
                     /* comment0 */
                     {
@@ -54,18 +54,39 @@ namespace Newtonsoft.Json.Tests.Issues
                     /* comment2 */
                 ]
             }";
-            var error = false;
 
-            try
-            {
-                JsonConvert.DeserializeObject<Simple>(json);
-            }
-            catch
-            {
-                error = true;
-            }
+            Simple s = JsonConvert.DeserializeObject<Simple>(json);
+            Assert.AreEqual(2, s.Array.Length);
+            Assert.AreEqual("item1", s.Array[0].Value);
+            Assert.AreEqual("item2", s.Array[1].Value);
+        }
 
-            Assert.IsFalse(error);
+        [Test]
+        public void Test_Multidimensional()
+        {
+            string json = @"[
+                /* comment0 */
+                [1,2,3],
+                /* comment1 */
+                [
+                    /* comment2 */
+                    4,
+                    /* comment3 */
+                    5,
+                    /* comment4 */
+                    6
+                ]
+                /* comment5 */
+            ]";
+
+            int[,] s = JsonConvert.DeserializeObject<int[,]>(json);
+            Assert.AreEqual(6, s.Length);
+            Assert.AreEqual(1, s[0, 0]);
+            Assert.AreEqual(2, s[0, 1]);
+            Assert.AreEqual(3, s[0, 2]);
+            Assert.AreEqual(4, s[1, 0]);
+            Assert.AreEqual(5, s[1, 1]);
+            Assert.AreEqual(6, s[1, 2]);
         }
     }
 
@@ -118,10 +139,10 @@ namespace Newtonsoft.Json.Tests.Issues
                 return null;
             }
 
-            var lineInfoObject = Activator.CreateInstance(objectType) as JsonLineInfo;
+            JsonLineInfo lineInfoObject = Activator.CreateInstance(objectType) as JsonLineInfo;
             serializer.Populate(reader, lineInfoObject);
 
-            var jsonLineInfo = reader as IJsonLineInfo;
+            IJsonLineInfo jsonLineInfo = reader as IJsonLineInfo;
             if (jsonLineInfo != null && jsonLineInfo.HasLineInfo())
             {
                 lineInfoObject.LineNumber = jsonLineInfo.LineNumber;
diff --git a/Src/Newtonsoft.Json.sln.DotSettings b/Src/Newtonsoft.Json.sln.DotSettings
index 80c25a7e..72cfc364 100644
--- a/Src/Newtonsoft.Json.sln.DotSettings
+++ b/Src/Newtonsoft.Json.sln.DotSettings
@@ -1,14 +1,22 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
\ No newline at end of file