Update types to be more compatible
Merge branch 'next' into new-format

Conflicts:
	bliparser/BKSDLTrack.c