Merge remote-tracking branch 'upstream/master' into Improve-Logging

setup.py

@@ -92,6 +92,7 @@ setup(
         'MarkupSafe',
         'mistune',
         'Pillow',
+        'pluggy',
         'Pygments',
         'python-editor',
         'pytz',