Merge pull request #4818 from dibdot/banip