Bug 971179: add another of gcox's keys; r=Callek
Merge default -> production

--HG--
branch : production