Forward port of delayed-join.patch from Quakenet's "Asuka" patch set