Merge pull request #1563 from dibdot/adblock-17.01