Merge pull request #3012 from dibdot/adblock