Merge 0.9.1 branch.

--HG--
branch : HEAD