Merge pull request #4971 from StevenHessing/noddos