update for ESA pyhton 2013
Merge branch 'tao' into sprint7