Update merge from Mozilla Mercurial