Merge pull request #2430 from dibdot/banip