Updated Upstream (BungeeCord)#860

linsaftw wants to merge 2 commits intoPaperMC:masterPaperMC/Waterfall:masterfrom

ArkFlame:masterArkFlame/Waterfall:masterCopy head branch name to clipboard