Fix edgeline test.
Merge branch 'master' into tile-scanline

Conflicts:
	test/test.js