python2.4 compat
python2.4 compat
Merge branch 'master' into python2.4