Fix typo
Merge pull request #1454 from rhcarvalho/patch-2

Fix typo
Version 2.3.13
It's 2014 now, dontchaknow
Merge remote-tracking branch 'upstream/master'
it's safe to import scope and constants