Merge branch '1.2'

Author: bitprophet

tests/context.py

@@ -193,6 +193,7 @@ def should_occur_before_prefixes(self, Local):
         def should_use_finally_to_revert_changes_on_exceptions(self, Local):
             class Oops(Exception):
                 pass
+
             runner = Local.return_value
             c = Context()
             try:
@@ -260,6 +261,7 @@ def nesting_should_retain_order(self, Local):
         def should_use_finally_to_revert_changes_on_exceptions(self, Local):
             class Oops(Exception):
                 pass
+
             runner = Local.return_value
             c = Context()
             try: