Remove GotBlock
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/client.cpp
	src/clientserver.h
	src/server.cpp