Fix sass test fixture
Catch execjs error subclass

Conflicts:
	test/test_environment.rb
Merge branch '2.x'