Fix silly mistake in test
Merge remote-tracking branch 'origin/master' into oja-br-mode

Conflicts:
	test/main.js
Rename lodash module to lodash-modern