Merge pull request #1463 from dibdot/adblock