Merge pull request #2280 from dibdot/banip