Merge with default (feature freeze for 0.6)

Bug fixes and tunings only on the stable branch, until the
next tag is issued.

--HG--
branch : stable