Merge pull request #4838 from StevenHessing/noddos