Merged in DR v1.2.0.1

test/stats/EntranceShuffleStats.py

@@ -1,5 +1,7 @@
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 import RaceRandom as random
-import logging
 import time
 
 from collections import Counter, defaultdict
@@ -99,7 +101,7 @@ def test_loop(tests, entrance_set, exit_set, ctr, shuffle_mode, main_mode, links
         # seed = 635441530
         random.seed(seed)
         world = World(1, {1: shuffle_mode}, {1: 'vanilla'}, {1: 'noglitches'}, {1: main_mode}, {}, {}, {},
-                      {}, {}, {}, {}, {}, True, {}, {}, [], {})
+                      {}, {}, {}, {}, {}, True, {}, [], {})
         world.customizer = False
         world.shufflelinks = {1: links}
         create_regions(world, 1)