pavel-cliqz Merge branch 'master' into cliqz-it-again