Update to esprima master