Replace brackets where necessary
Merge branch 'master' into telemetry.mozilla.org