Update from Mozilla repository
20130114 changes