master update (support for ES 1.0.x)