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