Fix Python 3.2
Merge branch 'es-host'