added failing test
fixed failing test
Merge branch 'v1.8'
v1.6

Conflicts:
	package.json
	spec/test.coffee