remove non-https tracking pixels
Merge branch 'master' into staging