Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 15 pull requests

- Pull request #1104 at 1f7af77: Handle simple adhesion within the axle module
- Pull request #1057 at 1c2bcb4: Switchable brake system
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 7fc8de1: Automatic speed control
- Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1123 at dc286f5: Handle null control active locomotive
- Pull request #1125 at 7a4f055: Lift #1096 into 1.6 release
- Pull request #1129 at 034b6e2: adds missing es.po files
- Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID.
- Pull request #1131 at d8f0d8c: fix: Skip byte position from compressed files as it is not supported
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller

Author: openrails-bot

Source/Orts.Parsers.Msts/SBR.cs

@@ -522,18 +522,24 @@ public override void ThrowException(string message)
 
     public class SBRException : Exception
     {
+        static long GetPosition(BinaryBlockReader sbr)
+        {
+            if (sbr.InputStream.BaseStream is DeflateStream) return -1;
+            return sbr.InputStream.BaseStream.Position;
+        }
+
         public static void TraceWarning(BinaryBlockReader sbr, string message)
         {
-            Trace.TraceWarning("{2} in {0}:byte {1}", sbr.Filename, sbr.InputStream.BaseStream.Position, message);
+            Trace.TraceWarning("{2} in {0}:byte {1}", sbr.Filename, GetPosition(sbr), message);
         }
 
         public static void TraceInformation(BinaryBlockReader sbr, string message)
         {
-            Trace.TraceInformation("{2} in {0}:byte {1}", sbr.Filename, sbr.InputStream.BaseStream.Position, message);
+            Trace.TraceInformation("{2} in {0}:byte {1}", sbr.Filename, GetPosition(sbr), message);
         }
 
         public SBRException(BinaryBlockReader sbr, string message)
-            : base(String.Format("{2} in {0}:byte {1}\n", sbr.Filename, sbr.InputStream.BaseStream.Position, message))
+            : base(String.Format("{2} in {0}:byte {1}\n", sbr.Filename, GetPosition(sbr), message))
         {
         }
     }