Merge pull request #1893 from mdboom/misc/simplify-six

Fix some six changes
Fix Python 3 issue on big endian platforms
Add CHANGES entry