Documentation fix
Preparing for 1.0.7 development
Merge remote branch 'upstream/master'

Conflicts:
	midi.txt