Tried to fix various warnings.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/utilities.c