Initial commit on the stable branch.

--HG--
branch : stable
Merge with stable.