Bug 1096734: add debugging info; r=Callek (irc)
Merge default -> production

--HG--
branch : production