When checking types to convert data, don't forget about longs.  32-bit Pythons make longs from values that are ints on 64-bit Pythons.

Conflicts:
	common/djangoapps/util/converters.py