Merge branch 'udpnet' into old-dc-netplay (i really need to rewrite this properly)