Merge branch 'master' into python-3.3-to-3.5

uncompyle6/bin/uncompile.py

@@ -134,7 +134,8 @@ def main_bin():
         elif opt in ('--tree+', '-T'):
             if 'showast' not in options:
                 options['showast'] = {}
-            options['showast']['Full'] = True
+            options['showast']['after'] = True
+            options['showast']['before'] = True
             options['do_verify'] = None
         elif opt in ('--grammar', '-g'):
             options['showgrammar'] = True