Fixed merged upstream PR 216

Conflicts:
	esprima.js