Merge more post-0.9.3 fixes.

--HG--
branch : HEAD