tds running older instance of python, causing issues with ZipFile
Merge branch 'asa_master' into nightly
Nightly commit for 2013-03-21