Do not force CRLF conversion in test/*/*.result files
Merge branch 'stable'

Conflicts:
	third_party/luajit