Fix more warnings.
Fix naming conflict.
Fix GCC build again.
Merge remote-tracking branch 'remotes/upstream/master' into fixes

Conflicts:
	src/Map.cpp
Merge pull request #822 from igorko/fixes

Fix more warnings.