fix issue with max
Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	test/basic.js