Python 2.6 compatibility
Temporary 3.x compatibility disabled (test review needed)