Non-conflictual warning fixes
Merge commit '85ec17680c8182a189fe03ef76b40e728ee47a53'

Conflicts:
	src/tools/harbor.ml
	src/tools/server.ml
Merge remote-tracking branch 'origin/master' into fix-warnings