Merge branch 'grunt' into HEAD

Conflicts:
	gol.js
	tests/ts-test.js
	tests/ts-test.ts