Fix AttributeError on merge conflict
Fix AttributeError on merge conflict
blueyed/legit,jetgeng/legit,wkentaro/legit,nxnfufunezn/legit,kennethreitz/legit,jetgeng/legit,deshion/legit,hickford/legit,mattn/legit,ericmjl/legit,deshion/legit,wkentaro/legit,nxnfufunezn/legit,kennethreitz/legit,hickford/legit,blueyed/legit,mattn/legit,ericmjl/legit