Merge branch 'develop' of github.com:ghostery/ghostery-extension into… …

… develop

trickpattyFH20 committed May 11, 2018