Add hack to avoid 2s startup delay on local games
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/client.cpp
Merge remote-tracking branch 'upstream/master' into lock

Conflicts:
	src/client.cpp