Updated to fix errors on 2.5.

--HG--
branch : single-codebase