Changes accepted by upstream vendor and merged into trunk revision 6590.

(0) -10 -1 +1 tip

mercurial