Merge pull request #4950 from StevenHessing/noddos