Automatic merge of T1.6-rc4-32-g196d83e86 and 14 pull requests

- Pull request #1104 at 6ef735b: Handle simple adhesion within the axle module
- 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 #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID.
- Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters
- Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging
- 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
- Pull request #1128 at 1527403: Particle Emitter Overhaul

Author: openrails-bot

Source/Documentation/Manual/physics.rst

@@ -2499,7 +2499,6 @@ the one shown below::
         ORTSMaxParticles ( 2500 )
         ORTSRateMultiplier ( 1.0 )
         ORTSUseChaoticRandomization ( false )
-        ORTSShapeHierarchy ( "MAIN" )
     )
 
 The code block consists of the following elements:
@@ -2528,7 +2527,6 @@ The code block consists of the following elements:
    single: ORTSMaxParticles
    single: ORTSRateMultiplier
    single: ORTSUseChaoticRandomization
-   single: ORTSShapeHierarchy
 
 After including these settings, additional *optional* parameters unique to OR can
 be included to further customize effect emitters:
@@ -2632,14 +2630,6 @@ be included to further customize effect emitters:
   randomziation algorithm changes the random values by a small amount for each iteration. The "chaotic"
   algorithm tends to make exhaust that is more spread out and discontinuous, which may be desireable in
   some cases.
-- ``ORTSShapeHierarchy ( MATRIXNAME )`` -- Selects the sub object of the engine/wagon
-  shape the emitter should be attached to using the name of the sub object matrix.
-  The x, y, z location given earlier will then be measured relative to the sub object,
-  and the emitter will move as the sub object moves in real time.
-  Matrix names can be determined using shape viewing programs. If the given name
-  cannot be found, a warning is produced in the log and the emitter will be attached
-  to the main shape object. Similarly, if ``ORTSShapeHierarchy`` isn't defined, the emitter
-  will be attached to the main object, similar to the MSTS behavior.
 
 
 .. index::