Merge pull request #2409 from dibdot/adblock