No warning
dont crash
Remove GotBlock
Merge remote-tracking branch 'upstream/master' into farmesh4

Conflicts:
	src/clientiface.cpp
	src/clientiface.h
	src/server.cpp