Fixed merge accident. Next time I'm going to run the entire test suite ...
Fixed merge accident. Next time I'm going to run the entire test suite ...

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator