Updated 879293
Merge branch 'master' of github.com:gabrielluong/mozilla-patch-queue