Merge branch 'master' into ernie

Conflicts:
Merge branch 'master' into ernie

Conflicts:
	test/integration/user_spec.js