Bug 939817 - bustage fix,r=none
merge default -> production

--HG--
branch : production