Merge pull request #1863 from dibdot/adblock