Merge branch 'firefeature'
Merge branch 'master' of https://github.com/jleeothon/walrus