Bug 971952 - Update mshal's key; r=dustin
Merge from default

--HG--
branch : production