messed secure functions up in previous commit, but this time everything is fine.
Merge branch 'master' into override

Conflicts:
	midifile.c
	midiutil.c