Sync with 1.22 from ckmame.

--HG--
branch : HEAD
1 file changed