Added comparison operators for 'int' in Python 2
Added lost changes from master