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