Merge pull request #1647 from dibdot/adblock