Backport manually r62342 from the py3k branch to the trunk.
Backport manually r62342 from the py3k branch to the trunk.

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