Merge pull request #2019 from dibdot/adblock