merge post-0-9-3.

--HG--
branch : HEAD