Merge pull request #6616 from dibdot/adblock-18.06
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 30 Jul 2018 20:06:58 +0000 (23:06 +0300)
committerGitHub <noreply@github.com>
Mon, 30 Jul 2018 20:06:58 +0000 (23:06 +0300)
adblock[18.06]: backport release 3.5.4 to 18.06 branch


Trivial merge