Fix compilation..
Merge remote-tracking branch 'origin/master' into fix-warnings
Fix remaining non-controversial warnings.
Merge branch 'master' into fix-warnings

Conflicts:
	src/tools/harbor.ml
	src/tools/wav_aiff.ml