Merge pull request #4279 from shuffle2/Aestek-feature/netplay-oneclick Aestek feature/netplay oneclick
