Fix sys.maxint/maxsize confusion causing test failure on 64bit
Merge branch 'issue_262' into 2.1