Masterserver mods announse, ipv6, better curl errors
Merge remote-tracking branch 'upstream/master' into masterserver

Conflicts:
	minetest.conf.example
	src/serverlist.cpp
	util/master/list.js
	util/master/master.cgi
	util/master/style.css