[Close #435]
Merge branch 'master' of https://github.com/mozilla/collusion