Manually merge #213

- Support for ES 1.31 (Thanks to @jlinn)