Port parser.py to Python 2.4 :-(
Merge branch 'feature/us21' into dev