Fix Python2.6 support.
Merge remote-tracking branch 'origin/p26_support'