Merge branch 'master' of https://github.com/mozilla/zippy into 932577-adding-terms