Oops. Forgot that one.

--HG--
branch : stable
Merged with stable.