Merge pull request #2841 from dibdot/adblock