Removed use to writeheaders() method in order to run under Python 2.6 in QA/Prod.
Merge remote-tracking branch 'origin/master'