naira-cliqz merged 3 commits into master from UpgradeFlow Feb 7, 2019