Merge pull request #2711 from dibdot/banip