Test commit of my own sf2.idc
Merge remote-tracking branch 'origin/master'

Conflicts:
	disasm/sf2.idc
Merge remote-tracking branch 'origin/master'

Conflicts:
	generate/fixes/fixes.idc
	generate/splits/splits.idc