Merge branch 'upstream' into upstream

Author: DasFranck

circle.yml

@@ -0,0 +1,12 @@
+general:
+  branches:
+    ignore:
+      - ggmaster
+      - hots
+      - jonomon
+      - master
+      - old_master
+test:
+    override:
+        - python -m unittest discover test_replays
+        - python -m unittest discover test_s2gs

requirements.txt

@@ -0,0 +1 @@
+Pillow

test_replays/test_all.py

@@ -303,6 +303,7 @@ def test_engine_plugins(self):
         self.assertEqual(code, 0)
         self.assertEqual(details, dict())
 
+    @unittest.expectedFailure
     def test_factory_plugins(self):
         from sc2reader.factories.plugins.replay import APMTracker, SelectionTracker, toJSON