Associated test
Merge branch 'master' into mock-override

Conflicts:
	test/auth.js
Enable --recursive for coverage
Merge branch 'master' into mock-override