Fix execjs error assertion
Merge branch '2.x'

Conflicts:
	test/test_environment.rb